Merge branch 'master' of https://github.com/gpsbabel/gpsbabel

diff --cc CMakeLists.txt
Simple merge

diff --cc GPSBabel.pro
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc vecs.h
index eeb020180d5bddf6f3444c2050db741f86a0dd5d,e97a2f5931109fb53a2f9629a912693ef757eb07..ee5a082c0905cdd6fba7a24053250a00f403d3ee
--- 1/vecs.h
--- 2/vecs.h
+++ b/vecs.h
@@@ -30,13 -31,11 +31,12 @@@
  #include "format.h"
  #include "ggv_bin.h"
  #include "gpx.h"
 +#include "yahoo.h"
  #include "legacyformat.h"
+ #include "mynav.h"
+ #include "xcsv.h"
  
  
- #if CSVFMTS_ENABLED
- extern ff_vecs_t xcsv_vecs;
- #endif // CSVFMTS_ENABLED
  extern ff_vecs_t geo_vecs;
  extern ff_vecs_t mag_svecs;
  extern ff_vecs_t mag_fvecs;